cmake/DaemonGame: do not reset BUILD_GAME_NACL in cmake subproject#1621
Merged
cmake/DaemonGame: do not reset BUILD_GAME_NACL in cmake subproject#1621
Conversation
2b067e0 to
28afb9f
Compare
Member
Author
|
Unfortunately the CI could not catch that, because everything to build was built successfully, but some targets were not added, so not built at all. |
Member
Author
|
I merge it quickly because build is broken and people are waiting for this to rebase. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Mysteriously, a commit discussed in #1555 and implemented before merging was missing.
Another bug slipped in resetting
BUILD_GAME_NACL.Fixup for:
Fix Unvanquished/Unvanquished#3355: